Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix FXIOS-8309 [v122.1] System theme resetting bug (backport #18429) #18456

Merged
merged 2 commits into from
Jan 29, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 29, 2024

This is an automatic backport of pull request #18429 done by Mergify.
Cherry-pick of 43e00b7 has failed:

On branch mergify/bp/release/v123/pr-18429
Your branch is up to date with 'origin/release/v123'.

You are currently cherry-picking commit 43e00b79f.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   BrowserKit/Sources/Common/Theming/DefaultThemeManager.swift
	modified:   BrowserKit/Sources/Common/Theming/ThemeManager.swift
	modified:   firefox-ios/Client/Frontend/Settings/Main/General/ThemeSetting.swift
	modified:   firefox-ios/Client/Frontend/Theme/LegacyThemeManager/LegacyThemeManager.swift
	modified:   firefox-ios/Client/Telemetry/TelemetryWrapper.swift
	modified:   firefox-ios/firefox-ios-tests/Tests/ClientTests/Mocks/MockThemeManager.swift

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   firefox-ios/Client/Frontend/Settings/ThemeSettings/ThemeMiddleware.swift

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* fix issue

* improvements because they're nice

* fix mock

(cherry picked from commit 43e00b7)

# Conflicts:
#	firefox-ios/Client/Frontend/Settings/ThemeSettings/ThemeMiddleware.swift
@mergify mergify bot requested a review from a team as a code owner January 29, 2024 16:32
@mergify mergify bot added the conflicts label Jan 29, 2024
@mergify mergify bot requested review from jnrahme and removed request for a team January 29, 2024 16:32
@adudenamedruby adudenamedruby requested review from adudenamedruby and removed request for jnrahme January 29, 2024 16:35
@mobiletest-ci-bot
Copy link

Messages
📖 Project coverage: 33.37%
📖 Edited 7 files
📖 Created 0 files

Client.app: Coverage: 31.98

File Coverage
LegacyThemeManager.swift 51.85%
ThemeMiddleware.swift 89.23%
TelemetryWrapper.swift 69.65%
ThemeSetting.swift 0.0% ⚠️

CredentialProvider.appex: Coverage: 21.89

File Coverage
LegacyThemeManager.swift 51.85%

Generated by 🚫 Danger Swift against 4d5880e

@adudenamedruby adudenamedruby merged commit 31bb66a into release/v123 Jan 29, 2024
9 checks passed
@adudenamedruby adudenamedruby deleted the mergify/bp/release/v123/pr-18429 branch January 29, 2024 17:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants